From 1e02021d84ba3fcebfc23861965619bfb966f24f Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Tue, 15 Dec 2015 14:14:00 +0100 Subject: [PATCH] build: convert HAS_EHCI use to Kconfig Use the Kconfig generated CONFIG_HAS_EHCI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/char/Kconfig | 7 +++++++ xen/drivers/char/Makefile | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 88955e7030..393127df52 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -5,6 +5,7 @@ config X86 def_bool y select HAS_ACPI select HAS_CPUFREQ + select HAS_EHCI select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c27e0d6c7f..4ca69a1650 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_EHCI := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index c81b109df0..08973cfaf5 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -49,3 +49,10 @@ config HAS_SCIF help This selects the SuperH SCI(F) UART. If you have a SuperH based board, say Y. + +# USB EHCI debug port support +config HAS_EHCI + bool + help + This selects the USB based EHCI debug port to be used as a UART. If + you have an x86 based system with USB, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index f9d9a9ca59..aa620fc890 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -5,6 +5,6 @@ obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o obj-$(CONFIG_HAS_SCIF) += scif-uart.o -obj-$(HAS_EHCI) += ehci-dbgp.o +obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- 2.30.2